Build a libcanvas_pixbuf.

* configure.in, gdk-pixbuf/Makefile.am: Build a libcanvas_pixbuf.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 2d30078e793471f20b3464eed0c5d71193103cdd..54221352f94d144c4d12775b325fb4db690cc535 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,5 +1,7 @@
 2000-01-10  Elliot Lee  <sopwith@redhat.com>
 
+       * configure.in, gdk-pixbuf/Makefile.am: Build a libcanvas_pixbuf.
+
        * configure.in: Define version macros. Generate gdk-pixbuf/gdk-pixbuf-features.h. Always INSIDE_GNOME.
        * gdk-pixbuf/Makefile.am: Add gdk-pixbuf-features.h
        * gdk-pixbuf/gdk-pixbuf.c: Add definitions of gdk-pixbuf-features.h declarations, plus some initialization stubs.

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 4841efb4e4d8eda8dfbc47c3434c435338025f63..20ae6888bc1727d02ca4ef97d99fe0dea2d84e6f 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -1,7 +1,16 @@
 SUBDIRS = pixops
 
+if CANVAS_PIXBUF
+CPLIB=libcanvas_pixbuf.la
+libcanvas_pixbuf_la_SOURCES=gnome-canvas-pixbuf.c
+CANVAS_HEADERFILES=gnome-canvas-pixbuf.h
+else
+CPLIB=
+CANVAS_HEADERFILES=
+endif
 lib_LTLIBRARIES =              \
-       libgdk_pixbuf.la
+       libgdk_pixbuf.la        \
+       $(CPLIB)
 
 libexecdir = $(libdir)/gdk-pixbuf/loaders
 
@@ -51,6 +60,9 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
 
 LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
+if CANVAS_PIXBUF
+endif
+
 if INSIDE_GNOME_LIBS
 testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) -lgmodule
 testpixbuf_drawable_LDADD = $(LDADDS)